bitkeeper revision 1.1159.212.38 (41f6537aX7dfqsdH6-jWzX24faBDtQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 25 Jan 2005 14:11:06 +0000 (14:11 +0000)
commitf36f30128e7fa1ab638ff4479cf81d84214dc08c
tree8e234296b2dfdbb8746ad51579ac0b7150c8259e
parentab581cc0d95e79d85bde2e5e439bcb0590d284bc
parentfe59039ac0b2d2bf8bcc2d4718e2461817544aeb
bitkeeper revision 1.1159.212.38 (41f6537aX7dfqsdH6-jWzX24faBDtQ)

manual merge.
xen/Makefile
xen/arch/x86/Makefile
xen/arch/x86/domain.c
xen/common/physdev.c